From: George Dunlap Date: Thu, 24 Mar 2016 17:18:32 +0000 (+0000) Subject: libxl: Remove redundant setting of phyical-device X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1396 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e885362ccbec19321874abb74e2d317193f45ce5;p=xen.git libxl: Remove redundant setting of phyical-device Regardless of whether we're running a custom hotplug script or using normal phy: or file:, the "block" script will be run, which will set all the necessary xenstore nodes. In fact, writing this value here prevents the block script from accomplishing its only purpose: to detect duplicate physical block devices used in different virtual devices. The first thing the block script does is check to see if this node is written; and if it is, it silently exits. Remove this, and let the block script perform its duplicate checking function. NOTE: It's likely that the duplicate checking for physical devices has never been run under libxl (at least since this bug was introduced); this may shake out some issues. Signed-off-by: George Dunlap Acked-by: Ian Jackson Tested-by: George Dunlap --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index e53f6a8b3a..97d47b21d4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2462,21 +2462,6 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, libxl__xen_script_dir_path()); flexarray_append_pair(back, "script", script); - /* If the user did not supply a block script then we - * write the physical-device node ourselves. - * - * If the user did supply a script then that script is - * responsible for this since the block device may not - * exist yet. - */ - if (!disk->script && - disk->backend_domid == LIBXL_TOOLSTACK_DOMID) { - int major, minor; - if (!libxl__device_physdisk_major_minor(dev, &major, &minor)) - flexarray_append_pair(back, "physical-device", - GCSPRINTF("%x:%x", major, minor)); - } - assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD); break;